Merge changes from emacs-24; up to r108039
authorChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:14:47 +0000 (13:14 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:14:47 +0000 (13:14 +0800)

Trivial merge